Bac 1276 for release branch