Recent changes
Merge remote-tracking branch 'mainpr/master' into innovations
Some updates