- merged proper fix for dev-stable stack