[OS-BUILD PATCH 0/8] 5.11 general can cleanup