(Miguel please remove it when resending) LPS-50675 Prepare for local deployment