Merge commit '504bb17287c978d60a4a515555852465319f74ed' into var-subset