make sub assignments current
Merge branch 'dev'