Merge branch '3534_fix_prompt_command'