Merge tag '1.2.0' into develop

1.2.0
Added FAQ