Some fixes
Merge remote-tracking branch 'origin/Frankenstein' into Frankenstein