Two commits at once

This is the full description of what was changed