Merge "Auto deploy prototype #2"