Fixed GAE-only bug caused by that the fix for bug #3128073 was not properly merged into the GAE branch in FM 2.3.17.