master-bc-2026

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