v2.0.5.3

- added Yasti's 'Misc Fixes 3'