master-bc-2763

https://issues.liferay.com/browse/LIFERAYQA-11706
https://issues.liferay.com/browse/LIFERAYQA-11674
https://issues.liferay.com/browse/LIFERAYQA-11718
https://issues.liferay.com/browse/LIFERAYQA-11710