SSW-555 P03

Initial commit for SSW-555 P03