master-bc-2214

https://issues.liferay.com/browse/LIFERAYQA-10492
https://issues.liferay.com/browse/LIFERAYQA-10462