eos copy
Merge branch 'gr_improvements'