master-bc-1873

https://issues.liferay.com/browse/LIFERAYQA-9530
https://issues.liferay.com/browse/LIFERAYQA-9580