Tested with release 6.1.0.Beta4