Master merged in