[arch-dev-public] [signoff] vi-050325-4