am a503def1: Merge "Support correction conversion from skip to additional proximity"

* commit 'a503def1c26818a1975647d0dc7e4f2492660214':
  Support correction conversion from skip to additional proximity