Break down spec_watched request wrappers into smaller methods
Merge commit '776b56cc316638709024bdb82755a8b24d383833' into public-master