Another merge request, this time from a new branch

Same changes as last time :)