Merge branch 'develop' into optimal_dpph
dpph methods are tabs
Merge branch 'optimal_dpph' into develop