master-bc-1768

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