FW 8.1.1 cherry-picks

Fix for an API change. Some of the FW 8.1.1 cherry-picks.