[trunk r16-7536-g6e52c1dbfb7]
