Attempt to move to knockout variable bindings for policy
Merge remote-tracking branch 'origin/master'