Merge branch 'master' into feature/5793-fsutil.getFeature-fails-when-called-with-object.class-on-multi-valued-features-v2