Merge branch 'addmainunit2-altlink' into addmainunit2-altlink-sharedstmt