normal commit
Merge branch 'develop_lib'

Conflicts:
	platform/pf_platform.c