master-bc-3053

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