Merge pull request #3321 from BrzVlad/fix-block-state-membar