US579:Circs and claim alignment
Merge remote-tracking branch 'origin/development' into development