Merge "Fix notice when restbaseCompat is omitted"