master-bc-957

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