If you agree I can add that commit into this PR if you want or open a new PR later.