Merge remote-tracking branch 'agl/sandbox/locust2001/rocko' into HEAD