index: fix misalignment due to extra container
Merge branch 'master' into pr/2