Merge changes I6e837e6f,Ibec70e66

* changes:
  remove WIDE_REFERENCE definition
  remove ARCHITECTURE definition