fix if statement
Merge branch 'release/r5'