Merge branch 'rej' into 'master'