ELS-1285 Initial Commit