One merge request to rule them all

... to find them, to bring them all, and in the darkness bind them