Not sure whether I should create this MR against develop or master, let me know if I should change that.