Updated changelog
Updated changelog
Updated changelog
Added message for expert users
merge