[master] comment pending fix