master-bc-936

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