merged for rebase master onto b1