merge for next Production (second try)