master-bc-2115

https://issues.liferay.com/browse/LIFERAYQA-10216
https://issues.liferay.com/browse/LIFERAYQA-10032