Sort:  

will HF 20 include 19.4?

Assuming 19.4 is done before HF 20 (which I believe is the plan) then yes.