Merge "Timing Hacks DO NOT MERGE" into lmp-dev