index check fix
Merge branch 'master' into test/options