Merge remote-tracking branch 'origin/feature/6771_ILL_D33'
Merge remote-tracking branch 'origin/feature/7437_doc_calibration'
Re #7464. Remove orphaned method declaration.

The definition went in #7463, but this was left behind.
Merge branch 'feature/7464_remove_orphaned_definition' into develop