Properly dirtify and generating changelog for stepsiblings, solves #2203
Merge branch 'issue/2203' into develop