[PATCH 6.1 v2 0/7] Backport Build ID fixes