Fix for vision

Change-Id: Iaea7acb9ca7a5b3c70d9d092fc6e4df958052f4c
Merge remote-tracking branch 'pac/pac-4.4' into pac-4.4