propagated all changes since "SQL_2-4-0_rc2" from the SQL_2-4-0 branch to the main branch
propagated all changes since "SQL_2-4-0_rc2"
from the SQL_2-4-0 branch to the main branch

zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb,zyzyis/monetdb