Merge: from consolidate_onitemremovedfromstack - Bugfix: added missing invokes for OnItemAddded/RemovedFromStack Tests: unit tests + automated tests