Merge branch 'priv-1.9'