master-bc-1945

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