master-bc-953

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