Using wrapper function for last insert id
Merge branch 'release/2.11' into release/12.0

* release/2.11:
  Using wrapper function for last insert id

Conflicts:
	module.xml