Fixed: Unable to switch to dovecot
Merge branch '1.1.x' into develop