master-bc-1926

https://issues.liferay.com/browse/LIFERAYQA-9739
https://issues.liferay.com/browse/LIFERAYQA-9784