master-bc-3128

https://issues.liferay.com/browse/LIFERAYQA-12449
https://issues.liferay.com/browse/LIFERAYQA-12448
https://issues.liferay.com/browse/LIFERAYQA-12160