3.0 dev - merge with master