Update the 0.6.1 tag to the merged commit

[Story #45771305]