merge mannix code feb-13