Use canonical callback method calls
Merge branch 'chore/clean_up_callback_methods-13' into development

* chore/clean_up_callback_methods-13:
  Use canonical callback method calls