HC for DEV branch implemented