Merge "Ignoring invalid deep shortcuts during load" into sc-dev