Fixed #19635 -- Made fields pickleable