merged nolans commit