Merge branch 'nadav-har-tzvi-AMATERASU-45-Rebase' of github.com:nadav-har-tzvi/incubator-amaterasu into nadav-har-tzvi-AMATERASU-45-Rebase