Fix merge to reflect freehandwritting update