Merge "Commit of various live hacks"