* Merged non branched code changes from Deamon5550.