CRAFTERCMS-447: Initial update to support auto watch