Merge branch 'foreign/anand/dev-del-by-id-ext' into for-chris-4.7-20160516