* Add changed key in faliure case to maintain backward compatibility (cherry picked from commit 1a66121f03)
1a66121f03