incorporating changes from the master branch of base repo