master-bc-2245

https://issues.liferay.com/browse/LIFERAYQA-10515
https://issues.liferay.com/browse/LIFERAYQA-10556
https://issues.liferay.com/browse/LIFERAYQA-10513