Merge Master into ratio-calculation-absorption

Also make a few changes to match current frontend work.