Dev/issue 6682