CAS-1414: added missing final keywords