master-bc-1342

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