finish before casting and fixes
Merge remote-tracking branch 'origin/master'