2014.7

This contains some fixes/tests discussed in #17299

ok, I see it