Merge pull request #1690 from bradymiller/zbig01-go-23-on-master