rhbz1069428 - Seam scope fix

This is just rebasing #385 to release branch