master-bc-1934

https://issues.liferay.com/browse/LIFERAYQA-9791
https://issues.liferay.com/browse/LIFERAYQA-9805