master-bc-1964

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