master-bc-1698

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