[v6r12] Few updates for RMS deprecated