2021/05/26: 0.18.3.B+05a01OK MERGED in master