Merge branch 'master' into pam-progress