SVS resolution order (rebased onto dev_4_4)

Same as gh-232, rebased onto dev_4_4.