BUGFIX: Dispatch wasn't gating output properly. Normalize function
signature wasn't correct in view models.
Merge remote-tracking branch 'origin/master'