master-bc-1653

https://issues.liferay.com/browse/LIFERAYQA-8875