Vishal #0 moved AdherenceWindow to whp-common