BZ-13209 merged from RC20140807