t680 -- Fix GAD-7
Merge branch 't680' into resolved