solve 2151_Brave_Princess_Revisited
Merge branch 'feature-2151'