Merge "Revert^2 "Added FuzzableDataspaces.h""