[TIMOB-10380] Added check to make sure there is an active window on update
[TIMOB-10830] Updated the dependency map
[TIMOB-10380] Manual merge of master
[TIMOB-10380] Manual merge of master
[TIMOB-10380] Updated dependency map
Merge pull request #3682 from bryan-m-hughes/timob-10380

[TIMOB-10380] Added check to make sure there is an active window on update