Issue214 6

For you  to review. Let me rebase this on issue214_5 before you merge it.

Also, please review very carefully that no stuff from previous commits crept in via cherry pick. I did my very best, but you never know :-)