Merge branch 'feature/896-toggling-confirmation' into 'develop'