Merge branch 'feature/stabilization' into feature/skin-module