Fix 315: insert/select
Merge branch 'master' into pr/n316_Firebie