master-bc-2344

https://issues.liferay.com/browse/LIFERAYQA-10890
https://issues.liferay.com/browse/LIFERAYQA-10687
https://issues.liferay.com/browse/LIFERAYQA-10910