Feedback from 2paths

Change-Id: Id232248c28cf99dcef670b7b4d68499c5757ac8d