Merge branch 'pu/pb/index_quick_fix' into stable