Apply changes of #154 that were lost in append4-final