Merge "Make property resetter age down correctly" into devel/master