Merge "Adds a multi line preference class." into nyc-dev