Add require
Merge branch 'master' into STABLE