Feature/merge release 4 into dev

'require' is not defined.