Merge branch 'image-navigation' into next