Api is not sending the default success message. Fix #715
Merge remote-tracking branch 'origin/develop' into develop