Resolved conflicts of WSAS-1760 & committing