issues # 82, 83, 117
Merge remote-tracking branch 'refs/remotes/origin/master'
Integration of Scade part updates