merged change from sign-attribute-bundle