Merge "Add missing addQuotes() call to masterPosWait()"