Merge remote-tracking branch 'remotes/origin/main' into float-1579-remove-extra-encoder-app