master-bc-2549

https://issues.liferay.com/browse/LIFERAYQA-11349
https://issues.liferay.com/browse/LIFERAYQA-11180
https://issues.liferay.com/browse/LIFERAYQA-11350
https://issues.liferay.com/browse/LIFERAYQA-11360