Adds changes from #562 and #564 in dev-sci into main. (#566)

Adds changes from #562 and #564 in dev-sci into main. (#566) #118