[MERGE] Merged with main addons.