master-bc-1617

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