Merge "Change calipso verify path - by KorenLev"