Merge "Improved Force Key Frame Behaviour"