master-bc-2023

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