DEV-65 | support key override