[Merged] From Unstable to patch 98c1c

[fixed/added] templates on various mobiles (part 1 of n)