master-bc-2851

https://issues.liferay.com/browse/LIFERAYQA-11766
https://issues.liferay.com/browse/LIFERAYQA-11907
https://issues.liferay.com/browse/LIFERAYQA-11761