Merge unblock fix from REL1_4