Merge branch 'dev_henry_index_stop'
Merge branch 'master' into dev_henry_index_stop