Merge branch 'amf/Y5Y1C_update_for_0.11.1' into 0.42.1_staging