Bit of refactoring
Revert lower case codec
Merge branch 'mbst-9019-auto-picks'