Merge pull request #1603 from scandit-opm/reorder-ctor

Fix reorder-ctor warnings