2014.7

This contains some fixes/tests discussed in #17299

but iterating over the dict gives us the keys, why would be do this?