Updated for Liferay 6.2-CE-GA2