master-bc-917

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