master-bc-2230

https://issues.liferay.com/browse/LIFERAYQA-10536
https://issues.liferay.com/browse/LIFERAYQA-9581
https://issues.liferay.com/browse/LIFERAYQA-10498