Merge "Fixed a bug with HUNS and dreams" into mnc-dev