CDB-2891 Branch stabilization and models sync bugfix