master-bc-2769

https://issues.liferay.com/browse/LIFERAYQA-11711
https://issues.liferay.com/browse/LIFERAYQA-11767
https://issues.liferay.com/browse/LIFERAYQA-11736