Merge "Initial AQ1 restructuring."