master-bc-1576

https://issues.liferay.com/browse/LIFERAYQA-8529
https://issues.liferay.com/browse/LIFERAYQA-8694