merge into master and final tweaks in T-1h, stay tuned, I need a break