master-bc-1018

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