Fixed WP input set up on CDUs
Merge branch 'master' into 8G4