Version bump: 1.21.21. Removed a direct window reference.
Merge branch 'develop'