The view part of view issue done, edit part pending and passed to Cristi.
Merge remote-tracking branch 'origin'