Add clearwater-infrastructure box type
Merge branch 'add-clearwater-infrastructure-box'