Build: #169 did not complete Changes by Mike Beckerle