First testing for Doris Fork

Signed-off-by: Antonio Rojas <antonio.rojas@jalasoft.com>
Merge branch 'US007' into devel