SOE-636

Recently added