Added support for CORE-758, CORE-778, CORE-804