Merge branch 'master' into LMW-13-signup-widget
LMW-13 Renamed creator* properties