more work for obanyc-1964
obanyc-1964 some of the previous changes were too agressive
Merge branch 'master' into oba-compat