[sr-dev] git:master:021d4de2: Merge pull request #2399 from lbalaceanu/mdb_availability_control