merged fixes from RC_0_16
merged python fix from RC_0_16