Merge "Stop using charAt for Signatures"