master-bc-1863

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