Provider form update
Merge in 8/9/14