master-bc-1453

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