master-bc-1744

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