Re #7894. Fixing define macro for windoze.
Merge branch 'feature/7894_rename_image_view' into develop