New corrections on MA shortening handling after James' revision
Merge branch 'Upstream/master'