Merge Developer

* indicates required