Merge changes I3e8594f6,I2c6d40ee into rvc-dev

* changes:
  Made translation of headers consistent when going into the shelf
  Clipping headers to the shelf as well