Updated maint and custom patch edits