QA: Merge develop

Please review this diff block.