Rebase to master + minor updates
3 files changed