Fix require
Fix casing issue
Merge branch 'dev' into notificationmsg