Merge "edit of macro services in new view edit screen"