Merge "Fix for Bug 511 (yang)"