REF #4122 circulars, few bug fixes
Merge remote-tracking branch 'origin/master'