Dhm/bug perf loc

@cpennington @ormsbee Skipping the hotfix and doing as directly against this week's release. Please approve.