Merge - Bug Fixes.