Re: #1870 - Support nil HWPs