Merge VKC's version to beta (file path and config prog changes)