Merge branch 'topic/misc' into fix/misc