Merge commit 'alpha/update_2_12_for_2_11_2_series_merge^2' into HEAD