Merge back code from PRD to DEV, fix notifcation issue