Corrections on MA shortening handling
Merge branch 'Upstream/master'