master-bc-1046

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