Merge topics 'compute_count_fix', 'build_rewrite'