dev 2 stable: ready for merge