master-bc-1184

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