master-bc-1156

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