master-bc-1113

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