Update retrieveCacheObject to nil out primary key if needed
Merge branch 'development' into b/fault_error
Merge branch 'b/fault_error' into development