Merge pull request #475 from claco/sprint

Merged automatically by jenkins after successful gate test
[TA52]: tests for converging when attributes updated.
Merge pull request #477 from git-harry/sprint

Merged automatically by jenkins after successful gate test