Merge remote-tracking branch 'amir/release_sprint_5' into feature/tabs-history