Merge branch 'feature/xoslib_test' into develop