[fix][1760] Added fix for the missing context key issue in dolly! (…

[fix][1760] Added fix for the missing context key issue in dolly! (… #1531