intermediate commit, removed code paths that required request objects for nbc version (to save memory), updated rma tests