Reapply patch d8f3699e405c96817b9ab05f3e251921bf1c14e0
Reapply patch d8f3699e405c96817b9ab05f3e251921bf1c14e0

bevacqua/gaze,modulexcite/gaze,modulexcite/gaze,modulexcite/gaze,prodatakey/gaze,prodatakey/gaze,bevacqua/gaze,bevacqua/gaze,prodatakey/gaze