Issue #5781: Update ENGINE_VERSION and refactor some deprecated function usages