Merge Dev1.5.0 iks-github with ReikOberrath fork