Merged missing files from master