oops that was buggy.
Merge branch 'release/6.9.2' into devel