Update forms
Merge branch 'deviation' of https://github.com/eisq/scpm into deviation