Merge "Workaround task-resolution bug in AM" into pi-dev