Merge branch 'feature/separate-extended-richards' into 'master'