Cleanup.
Port fixes with proper mixes.
Merge branch 'develop'