Merge "fix of Bug 314"