Message index incrementing using interlock because conflicts possible without it
Merge branch 'develop'