master-bc-1038

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