Merge conflict resolved from roboscala/master