Merge "Avoid arc for edge effect drawing." into lmp-dev