Merge "Fix decanter issue in controller start script"