master-bc-1890

https://issues.liferay.com/browse/LIFERAYQA-9657
https://issues.liferay.com/browse/LIFERAYQA-9642