OPS2-AUTH READY FOR MERGE TO MASTER