merge file close fix from RC_0_16