Merge commit '049cae3' into sfu-deploy