merged in some changes from testing updates
Merge branch 'tmp' into tmp2