master-bc-1112

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