land import syntax refactoring on 1.x branch
merged method selections and fixes from the trunk