1.9 merge into master