1.0/dev-BUG08 Latest changes for BUG08