Merge branch 'optional-monit'