Branch createdrollback changes from release preparation of Bay