#1074 Changed logic for configuring / versioning / restoring child content options