3.0 merge

work in progress - do not merge yet