Merge branch 'release/1.6.4'
First try to updated for CB 1.7.2 R0.1 SNAPSHOT
!!! Not tested yet, may be buggy as hell, because of the .getItem() changes !!!
Merge branch 'master' into develop