Merge remote-tracking branches 'regulator/fix/doc' and 'regulator/fix/palmas' into...