MIRAGE: MIRAGE v2.95 - Bug Fixes

Change-Id: I1fa24013e6c7a1e2c1fdca15ec1bd9890cd9aa77