Merge branch 'topic/fix/misc' into topic/misc