Merge "Adding @Functional Interface"