rlandy's commits for PR206