Merge "Force save profiles for SIGUSR1" into oc-dev