Merge branch 'release/7.x-0.39' into develop
us1208 add user_alert & scheduler to makefile
Tagging version 7.x-0.40
Merge branch 'release/7.x-0.40'