Merge & web fixes
Pre merge