merged master in sp_config
partial work
merge stuff