LPS-30715 Added ShardUserAdvice
LPS-30715 Source formatting and refactoring
LPS-30715 Applying pattern to use the proper shard
LPS-30715 Move fix logic  into a more generic place
LPS-30715 Source formatting