Don't change static properties after codec creation
Merge branch 'master' into jp-reviews