Fix (#1486) merge conflict
Fix (#1486) merge conflict

clemahieu/raiblocks,clemahieu/raiblocks,SergiySW/raiblocks,SergiySW/raiblocks,clemahieu/raiblocks,clemahieu/raiblocks,clemahieu/raiblocks,SergiySW/raiblocks,SergiySW/raiblocks,clemahieu/raiblocks,SergiySW/raiblocks