Fix return type of docblock comment for bindIf
Merging. Fixing conflicts.
Fixing conflicts and merging.