Merge "Updated calipso scenario for master"