MR to align master with mad-dev branch

master was modified last time 2-3 year ago so it is time to update it with the latest changes done in mad-dev