solve 2545_Lion
Merge branch 'feature-2545'