Bug #1378885  merge