Jeremy

see commit comment @AjayAujla  @markmssd  @mdubey2014  @sli-fox