Merge branch 'zaahir/pr-betterif'