Merge "Fix for settings crash during PS setup" into main