Committing in changes from @garlieb