Synch up to `akr' branch.