bamboo support (merge from github)