Merge change 8008

* changes:
  Allow 205 and 305 to have content.