Don't mind me, I completely forgot this PR is against dev_4_4. (-: You make perfect sense.