include recent changes related to my build env