Updates keyfile path
Merge branch 'calFix' into dev