Merge branch 'master' into transmission_model_sw_architecture_revision