Merge remote-tracking branch 'regulator/topic/palmas' into regulator-next