Created by: mguijarr
This is the continuation of the work started in -now closed- PR #432.
See commit messages for details.