Merged with GPL 374_5656