master-bc-1619

https://issues.liferay.com/browse/LIFERAYQA-3851
https://issues.liferay.com/browse/LIFERAYQA-8698