Tuning Keystone Performance

SMBCAP-5552