Merge "Add bugfix flag for assist structure invisible parent bug" into main