Fixes and callback
Prepare Release.
Merge remote-tracking branch 'origin/development'