Merge branche "niceilm-master" into 2.0.8