master-bc-3069

https://issues.liferay.com/browse/LIFERAYQA-11877
https://issues.liferay.com/browse/LIFERAYQA-12236
https://issues.liferay.com/browse/LIFERAYQA-12298