master-bc-1039

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