merging updated features from xdmanager