Merge "Unbreak gen command and sync with current tree"