Merge "Expire rollback when apex is updated." into qt-dev