master-bc-2096

https://issues.liferay.com/browse/LIFERAYQA-9999
https://issues.liferay.com/browse/LIFERAYQA-10161
https://issues.liferay.com/browse/LIFERAYQA-10119
https://issues.liferay.com/browse/LIFERAYQA-10187