Merge "Tweak names and docs for resovling and inFlight actions." into tm-dev