master-bc-1621

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