Fix: static modifier doesn't insert as is
Merge remote-tracking branch 'origin/master'