Merge local branch add-view-exntend with SOA-2