Merging enabled, hopefully partial fix.