Merge from dark-al:master