Merge branch 'bp/post-index-change-hook'