master-bc-2021

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