Merge "Add missing size check when parsing staged aliases" into sc-dev