Removing AlignDescriptor dependence on ValueMap
Merge master