changes compatible with mds-0.24.2-SNAPSHOT
changes compatible with mds-0.24.2-SNAPSHOT