Fixed broken merge with latest master