Post rebase changes (view refactoring related changes)