master-bc-961

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