Merge branch 'sandbox' (remove finalize())