issue #20044: Remove dataState and type. Add option to retrieveRecord with or without toOne records nested by default. Default is nested.