Merged conflicts in MaxCubeBinding.java from marcelrv-maxcube