Sync master and calref branches