master-bc-3035

https://issues.liferay.com/browse/LIFERAYQA-12245
https://issues.liferay.com/browse/LIFERAYQA-12250