Merged Viva's branch