#1532 - working on delivered addons