master-bc-1356

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