6.2 bugfix and 2 new features