Merge "Resolves lp#941705"