master-bc-2132

https://issues.liferay.com/browse/LIFERAYQA-10123
https://issues.liferay.com/browse/LIFERAYQA-10222