Add version compat line
Merge remote-tracking branch 'chiiph/bug/refactor_version_compat' into develop