Merge branch 'issue-8881-reloadblock' into develop