Combined changes between TAG_OPS_3_0_1_200602150017 and 3.0.2 release