Feature/david 6.2

Incremental merge into develop for beta1