bash if fix
Merge branch 'release/r1p2'