[TIC-CORE] Merge remote-tracking branch 'origin/develop'