Merge "Replace manual insetting with .inset()"