[MERGE] [FWD] Forward porting in trunk of the 7.0 addons branch until rev 8584 (revid...