Merged with GPL 3626 (from AC68)