Issue(s) in this thread have been addressed by the following changes:
Fix saving new difficulty overrides its parent in collections. (WujekGrzyb)
The changes will be applied to builds newer than b20151014.5cuttingedge.
Please follow up in this thread if you believe more work needs to be done to fix the mentioned issues. If they have not yet been resolved, please provide any new details that may have arisen after this build.