NEON-1061 Adjusted timeframe margins