Merged with 'small upgrades' commit