Merge branch 'sk-sk_forward_alloc-fixes'