Merge remote-tracking branch 'origin/pario' into charm