merge from @chad-thompson