Bug #1389448  merge