Merge "Exception for Coriolis VVM App"