Merge "Fix for bugs 446 and 456"