Merge "Rectify inter-job blocking strategy"