XX-00001: Initial enhancements. Compilation from 5 different commits in ...

...bucket repo