[#213] Performed maintenance update
Merge branch '213-maintenance-release' into 7.x-1.x-dev