Added support and updated CORE-836