LPS-47507 reorder method
LPS-47507 Add test to cover new functionality
LPS-47507 Fix some issues detected by tests
LPS-47507 SF
LPS-47507 Autogenerated