Disable and stop EIP on setting save.
Merge remote-tracking branch 'refs/remotes/ivan/bug/4670_disable-eip-and-disable-actions' into develop