Merge branch 'kb/am-deprecate-resolved'