Merge of changes since 7.3-ohiggins tag