Merge remote-tracking branch 'origin/0007-finalizing'
finalizing