PR: 24191 Submitted by: Joseph Scott <joseph@randomnetworks.com>
It contains e16menuedit and e16keyedit. PR: 22110 22113 Submitted by: Jeremy Norris <ishmael27@home.com> Merged by: clive Reviewed by: Jeremy Norris <ishmael27@home.com>