Updates for graphics fixes, re-enabled all builds
Merge commit '68b12a62aad519ba5dd1e81ed9fc6b70a29e3e5d'