Better %I scope handling

Merged Ralf Jung requested to merge ralf/scopes into master

This the part of !651 (closed) that I think we can all agree on. :)

Edited by Ralf Jung

Merge request reports