Merge "update OperationStatus Based On ResourceStatus" into casablanca