Align develop and master branches, move features in different branches in dedicated instances and packages in order to simplify maintenance