Merged with v1.2 from master

This is a forced and squashed commit to be applied on jdf-quickstart branch.

Thanks.