Merge "Fix return value for check_36461"