Yesterday
merge from lr_deploy_speedup