merge issue/2044
merge issue/2044

mrakitin/sirepo,mrakitin/sirepo,mkeilman/sirepo,radiasoft/sirepo,radiasoft/sirepo,mkeilman/sirepo,mrakitin/sirepo,radiasoft/sirepo,mkeilman/sirepo,mrakitin/sirepo,mkeilman/sirepo,radiasoft/sirepo,radiasoft/sirepo