AC-52 Resolved conflicts
AC-52 Improve code