finally merging almv3 to master