[PATCH v2 0/4] fixes for Release 12 milestone