Merged from usm-rcg fork with new response structure and spring config changes