Merge "Allow none override + cleanup"