Pull request from 29.07

merge block