Applet Problem Fix

This is the release branch pull corresponding to the applet problem hotfix.