Merge branch 'dev' into configuration_clone

signed-off-by: Daniel Miranda <danielkza2@gmail.com>