Bring inline with master and resolve conflicts...