master-bc-1051

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