Merging changes from Damir Murat, Matija Folnovic, and Tomasz Kalkosinski for 2.1 release