CAL-658 Add missing keys
Merge commit 'e9f9879cb404391653388338a15c7a2e5e1ae6b4' into HEAD