dev fork May 6 for possible upcoming pull