Fix wrong memory layout setting.
Merge remote-tracking branch 'f9-upstream/master'