Merge branch 'bugfix/fix_regression_v1.2.4' into 'main'

Merge branch 'bugfix/fix_regression_v1.2.4' into 'main' #12