Make new reading fields optional
Merge branch 'master' into master-api