Merge branch 'nadav-har-tzvi-AMATERASU-45-Rebase'