Drop the disable time a little
Compiled Version
Merge master into compiled