Merge "asg: Tweak how window is calculated"