Merge "Remove AgingHelper code" into qt-dev