Merge pull request #836 from fahad-aot/feature/fwf-5206-multi-select

Merge pull request #836 from fahad-aot/feature/fwf-5206-multi-select #319