Merge "Check the keyString value." into devel/master