Merge "Check only task's override config for adjusting bounds" into oc-dev