Merge latest changes from dev_scamv #148

Closed andreaslindner closed 2 years ago