Merge "Let ModelCache use std::map instead of unordered_map" into devel/master