Merge branch 'pw/grpent_r'