Merge "Cast block start to int in maintenace SQL"