[MERGE] Merged Jagdish' branch for the fix of bug lp:767058