Merge branch 'master' into fix/conversion-issue

# Conflicts:
#	CMake/External/External_iMSTKData.cmake
8 jobs for fix/conversion-issue