Re #6929 Remove warning as agreed
Merge branch 'feature/6929_use_sancas_v1_1' into develop