Fix race condition bug where activating multiple features sequentially could fail to activate some features

Fix race condition bug where activating multiple features sequentially could fail to activate some features #1558