ticket #1900: start dev branch for ticket 1900 (copy of the preparatory work done in tickets_2494_2375)