Merge "Fix potential future problems re. hidden fields"