MT#8547 - Remove "keys on reference"