include Dirk's comments

Change-Id: Ie095e1b296ce543fd085a37851f252876b7baad1