ready for merge to master. V9.0