Develop

Fix #360169 and #360175