Merging ExtendedAssnTable bugfix