Fix in imaging
Merge branch 'development'