Update codebase to Element v1.6.18