Dev/issue 6673