sync with non-minimized version after merging of #3