merge from nate-parrot