master-bc-950

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