new merge from sabretooth
Meta files deleted