Merge "[calipso] Create stable/fraser branch"