Fixed windows compiler warning. Re #5403
Merge branch 'feature/5403_side_by_side_unwrap_view' into develop