New unified patch v2: all features in one clean file, no conflicts

71dcdcb

verified

bep40 commited on May 25