Merge changes; add various packages across platforms.