Merge changes from topic 'fix-monit-script'