Merge branch 'aldb_delta_v2' into running