Merge "Remove prompt-bypass"