hammer2 - Revamp flush and xopq mechanism, stabilization