Fixes/ng timeline wp create 7170