Updated from master and fixed merge conflict