LPS-32066 Fix - create preferences only when stored
LPS-32066 Change behaviour to be strict by default
WIP
WIP - TODO