master-bc-2190

https://issues.liferay.com/browse/LIFERAYQA-10394
https://issues.liferay.com/browse/LIFERAYQA-10452