Merge remote-tracking branch 'remotes/elmarco/tags/chr-split-pull-request' into staging