Built design from commit 45d8fae on branch 23-1