branch-rel-6839-r6908