Merge pull request #2274 from dulrich/master

Fixes #2267 and restores layout of production line tabs with multiple re...