Merge blocked user fix from REL1_4