master-bc-2899

https://issues.liferay.com/browse/LIFERAYQA-11844
https://issues.liferay.com/browse/LIFERAYQA-12036