Merge branch 'feat.command_line_option.transition' into fix.bootstrap.manifest

Author: rickeylev