Merge commit 'kha/safe'