Re #8908. Catch and handle the Rename notification.
Merge branch 'bugfix/8908_instrument_view_exception_after_rename' into develop