Make JoinKeys
related changes due to refactor
#486
Merged
JoinKeys
related changes due to refactor
#486