Merge "update bp and input template for ves7"