Issue on listbox/fields based on master data in the master instance: refs  #568
 Issue on listbox/fields based on master data in the master instance, after resolving conflicts: refs  #568