Lps 40317

Last commit, the ticket can be resolved.