Merge "Update suggestion/condition UI"