Improve block state change

Merged Samuel GAIST requested to merge improve_block_state_change into 1.4.x

Merge request reports