Merge remote-tracking branch 'origin/basop-2517-click-in-omasa-ltv-2nd-masa-channel' into basop-2517-click-in-omasa-ltv-2nd-masa-channel