Merge "Late binding: add support to Mac"