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