Merge "Remove deprecated handling of multiple arguments by the Block constructor"