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