Merge "Adding breaktrace & disabling timer migration"