Current Plateau and other commits
Merge branch 'development_wkstn'