all-wcprops #2

# Change User Description Committed
#2 7913 Brett Bates tidyup
#1 7908 Brett Bates up to date