2_10_6_pre4

PRODCOMMON_0_12_18_CRAB_65 for #1124