Update custom commands from mac branch