Bug Fixes
Performance Improvements
Signed-off-by: harsco <mnimishakavi@harsco.com>