pullin in to develop-feature that already has pull issued

feature fix