Merge branches 'master' and 'suser_to_priv'