adding bucket: first step, separate evaluation/non evaluating methods
Merge branch 'vdev' into develop
Merge branch 'sdev' into develop