Merge branch 'patches/marcus/gr_and_const'