2.5.5 release commit.

Fix endpoint bugs.
Fixed fallbacking function.