Merge "Fix NNFE when starting PersistentDataBlock" into sc-dev