Control per instance addressing (#3407)