Merge branch 'feature/fix-clippy-on-stable-channel' into development