s/{GetR,r}esourceMap/{GetD,d}istributionMap/ (NLC)
Merge branch 'release' into develop