Merge remote-tracking branch 'origin/more_flexible_code_generation'
Merge remote-tracking branch 'origin/add_primary_key_to_version_table'
Merge remote-tracking branch 'origin/fix_default_values'
Merge remote-tracking branch 'origin/fix_index_removal'