[MERGE]: Merged with latest trunk-server as there are many changes regarding config...