master-bc-1672

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