merged with source fabric branch