Development merge into master

Trial-level generation, ready for production