Merge "Block.php: replace '*' with explicit fields in selects"