Page type added
Feature widget content fix
Merge remote-tracking branch 'upstream/develop' into develop