Merge #724: Feature #677 widget cipher