Merge branch 'bug-282' into SysFera-master
Regenerate files