master-bc-952

https://issues.liferay.com/browse/LIFERAYQA-6769