DB-742 use consistent version macros