Added support to CORE-836