master-bc-1944

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