Import legacy master branch