Merge branch 'master' into register
Removing plan selector
Merge branch 'register' into testing