1.6.X Stable push

Check dev for being devolped stuff