Updates to bring the code up-to-date to the experimental branch

Signed-off-by: Gary Pamparà <gpampara@gmail.com>