Merge "Fix for Bugs 324"