Manual merge with the current nimsdata branch