muSpectre/feat%2Finternal_variables_T1831

bugfix/T2542