Merge "Fix build from multiple declaration"