Updates related to trying to remove an FP from an Award.
Merge remote-tracking branch 'origin/development' into development