Feature/gh 859