Updated extra modules
Close PROXY-25 #resolved #fixed
Merging Development Branch