Don't merge: address-indexed modifications

This PR is inteded to keep track the compatibility with mscore-0.0.9 and not intended to be merged.