Merge branch 'wip/sadiq/fixes' into 'master'