Merge branch 'topic/misc' into release/v1.0.24