BZ-11385: merge from master branch