CW-184 - Pool Settings modifications