patch/instance.updateAttributes: changes discussed on #1449

Pull Request created from #1720, since i've "lost" access to my older repo.
I guess it should, but could we get into the test failing problem? It would be easier to apply all on same commit. :)