Merge branch '7.0.x'

# Conflicts:
#	framework-platform/framework-platform.gradle