Bug 796743 / 799837 -  incremental recurring expansion / THISANDFUTURE impl