Dev/issue 6781