Added missing variables
Merge branch 'Ryo4' into ExoValDev2