Merge branch 'upstream_develop' into feature/metadata_modal_in_reader