Merge "Api request log: improve module retrieval"