bug fix for bugs 1355006, 1354579, 1354581, 1354579

Change-Id: I1eddcfbf7b1d7f16b930ab30ff4cf7525ff388ba