Recalcule status v1
Merge remote-tracking branch 'origin/recalcule-status'