Nastiness to circumvent a default setting

Change-Id: I7a74d84dbee5fd860b8efed0c5973197daf98549
Merge remote-tracking branch 'origin/master' into HEAD

0630d7aaf81868e487b71fcedf6a44709073da60 Nastiness to circumvent a default setting

Change-Id: I35188804707d7f12ef0aca606d17e897c66a3d8d