hey @mislav one question: should I incorporate the changes in 4f2f6f8575c75b8feb1a527168431817b9b6a7e4 so that this is easier to merge?