master-bc-2949

https://issues.liferay.com/browse/LIFERAYQA-12099
https://issues.liferay.com/browse/LIFERAYQA-12093
https://issues.liferay.com/browse/LIFERAYQA-10592