ALMD-34 second commit