Merge "Changes after TouchedSignal changes" into devel/master