switchyard update and as 7.1.1 upgrade [merge]