[v6r12] Back porting from integration tov6r12