master-bc-2288

https://issues.liferay.com/browse/LIFERAYQA-10656
https://issues.liferay.com/browse/LIFERAYQA-10671
https://issues.liferay.com/browse/LIFERAYQA-10022