Merging latest Rest Express changes