Merge remote-tracking branch 'origin/devel_1.0.x' into 377-in-appointments-the-workers-are-not-visible