Merge changes from topic 'move-net_config-idf'