Merge changes from topics 'decouple_verify_automate', 'simplify_automate_jjb'