master-bc-1883

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