master-bc-1446

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