Added DefaultPath and RequestId annotations.
Added DefaultPath and ResourceId Annotations
Merge remote-tracking branch 'origin/master'