Merge branch '1788_remove_pwd_h_grp_h_check'