master-bc-2607

https://issues.liferay.com/browse/LIFERAYQA-11319
https://issues.liferay.com/browse/LIFERAYQA-11281
https://issues.liferay.com/browse/LIFERAYQA-11171
https://issues.liferay.com/browse/LIFERAYQA-10834