master-bc-945

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