[Merge] Merge bug fix lp:683047,lp:684527