merge dev-kc to dev