master-bc-1100

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