merge mtinius updates