Dev/issue 6650b