Merge "Rename OnStage signals and related internal changes" into devel/master