Adding layer of indirection for REST
Merge remote-tracking branch 'LL/master'