Merging Valeriy's cyjs to match my up-to-date version. Resolving merges.