Revised endpoint design to support push-based functionality
Merge remote-tracking branch 'origin/master'