Merge branch 'master' into topic/add_accessions_improvements