Merge "bug 152"