LPS-51186 SF
LPS-47664 add more info to key