BZ-13209 merging changes to release-candidate