Modify assigns
Merge branch 'stoyan'