mod_rayo --resolve FS-6072 fixed prompt state machine
FS-5653 --resolve
FS-6032 --resolve