Merge my customizations with 3.1.9