Gee maint 1528 rebased

possible PR for #1314 extras and #1528 rebased on current master