build automation
Merge branch 'ticket91'