master-bc-1702

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