master-bc-1665

https://issues.liferay.com/browse/LIFERAYQA-8900
https://issues.liferay.com/browse/LIFERAYQA-8931