Merge branch 'release/r8p6' into develop
log the provided options
Merge branch 'release/r8p7'