Merge branch 't/cpsi_improvement'