Merge "Fix forceencrypt"