Add changes from adrian-bl