Merge pull request #11734 from EndangeredNayla/master GMPE01, GP5E01, GP6E01, GP7E01, RM8E01: Code Updates