bug fix
Merge branch 'notifier' into dev
Merge branch 'dev'
bug gic