Merge branch 'js/try-to-free-stackable' into next