master-bc-2022

https://issues.liferay.com/browse/LIFERAYQA-10009