Extending support for the SET- in developmenet
Fix merge conflicts